package/Shaders/DistantTree.hlsl (1)

206-214: LGTM! VR per-eye alpha threshold adjustment for stereo convergence.

The pattern correctly reduces alphaRef by 0.1 for the right eye (eyeIndex 1), enabling different alpha test outcomes between eyes for improved stereo edge handling. Both RENDER_DEPTH and non-RENDER_DEPTH paths are consistently updated.

The magic number 0.1 appears in multiple shaders (DistantTree, RunGrass). Consider defining it as a shared constant for maintainability:

💡 Optional: Use shared VR alpha adjustment constant

+// In Common/VR.hlsli or SharedData.hlsli
+static const float kVRAlphaEyeAdjustment = 0.1;

// Then in each shader:
-		alphaRef -= eyeIndex * 0.1;
+		alphaRef -= eyeIndex * kVRAlphaEyeAdjustment;

Also applies to: 222-230

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@package/Shaders/DistantTree.hlsl` around lines 206 - 214, Replace the
hardcoded per-eye adjustment value 0.1 with a named shared constant (e.g.,
VR_ALPHA_EYE_ADJUST) and use that constant wherever the shader currently does
"alphaRef -= eyeIndex * 0.1" (in the DistantTree shader blocks around
AlphaTestRefRS/eyeIndex/alphaRef and the analogous block used for RENDER_DEPTH
and the other occurrence similar to RunGrass). Add the constant to the common
shader include/shared header used by these shaders so both DistantTree and
RunGrass reference the same symbol, then update the subtraction sites to
"alphaRef -= eyeIndex * VR_ALPHA_EYE_ADJUST" to ensure maintainability and
consistent behavior across shaders.

package/Shaders/Common/VR.hlsli (1)

630-638: LGTM! VR Eye 1 sub-pixel jitter for stereo edge supersampling.

The jitter implementation correctly applies an NDC offset scaled by w for proper clip-space transformation. The magic numbers (0.53, 1.06) are documented as resolution-relative values for a reference SBS resolution.

Consider extracting these to named constants for clarity:

💡 Optional: Extract jitter constants

+		// Stereo edge supersampling jitter constants (pixels at reference resolution)
+		static const float kJitterHorizPx = 0.53;  // ~0.75px diagonal, horizontal component
+		static const float kJitterVertPx  = 1.06;  // ~0.75px diagonal, vertical component
 		if (a_eyeIndex == 1) {
-			// ~0.75px diagonal jitter for Eye 1 stereo edge supersampling.
-			// Scales with resolution: 0.53/halfWidth horizontal, 1.06/height vertical.
-			float2 kJitterNDC = float2(0.53 / (FrameBuffer::BufferDim.x * 0.5), -1.06 / FrameBuffer::BufferDim.y);
+			float2 kJitterNDC = float2(kJitterHorizPx / (FrameBuffer::BufferDim.x * 0.5), -kJitterVertPx / FrameBuffer::BufferDim.y);
 			vsout.VRPosition.xy += kJitterNDC * vsout.VRPosition.w;
 		}

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@package/Shaders/Common/VR.hlsli` around lines 630 - 638, Extract the
hardcoded jitter magic numbers into named constants and use them when computing
kJitterNDC: define descriptive constants (e.g., kJitterHalfWidthFactor = 0.53
and kJitterHeightFactor = 1.06) and replace the literals in the calculation
inside the a_eyeIndex == 1 block so kJitterNDC = float2(kJitterHalfWidthFactor /
(FrameBuffer::BufferDim.x * 0.5), -kJitterHeightFactor /
FrameBuffer::BufferDim.y); keep the subsequent vsout.VRPosition.xy += kJitterNDC
* vsout.VRPosition.w and leave a_eyeIndex, kJitterNDC, VRPosition, and
FrameBuffer::BufferDim usage unchanged.

src/Features/ScreenSpaceShadows.h (1)

65-65: Default behavior change: enableStereoSync now defaults to false.

This changes the out-of-box experience for VR users. Previously, stereo sync was enabled by default; now it must be explicitly enabled. Ensure this is intentional and documented in release notes.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Features/ScreenSpaceShadows.h` at line 65, The default for
enableStereoSync in ScreenSpaceShadows.h was changed to false which alters VR
behavior; either revert the default to true by restoring the initializer for
enableStereoSync in the ScreenSpaceShadows class/struct so stereo sync remains
enabled out-of-the-box, or if the new default is intentional, add a clear
comment next to the enableStereoSync declaration explaining the change and
update the release notes/CHANGELOG to call out that enableStereoSync now
defaults to false and must be explicitly enabled for VR users.

src/Features/VRStereoOptimizations.cpp (1)

83-86: CAS disabled by forcing strength to 0.

The code comment indicates CAS is "disabled for now" and the saved value is ignored. This is acceptable for a work-in-progress feature, but consider adding a TODO or tracking issue reference:

 	// CAS disabled for now — ignore saved value
+	// TODO: Re-enable CAS when stability issues are resolved (see issue `#XXXX`)
 	// if (o_json.contains("CASStrength"))
 	//	settings.casStrength = o_json["CASStrength"].get<float>();
 	settings.casStrength = 0.0f;

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Features/VRStereoOptimizations.cpp` around lines 83 - 86, Replace the
hardcoded disabling of CAS (settings.casStrength = 0.0f) with a short TODO
comment referencing a tracking issue or task ID and why the saved "CASStrength"
is intentionally ignored; for example, add a TODO/TICKET tag above the
assignment mentioning the issue number and expected re-enable condition, and
keep the current behavior (assignment to 0.0f) until that issue is resolved so
reviewers can see this is deliberate (referencing CASStrength and
settings.casStrength in VRStereoOptimizations.cpp).

package/Shaders/VR/VRPostProcessCS.hlsl (2)

29-33: Mode constants duplicated - same issue as StereoBlendCS.

This is the third location defining these mode constants. As suggested for StereoBlendCS, consider extracting to a shared header.

See previous comment on StereoBlendCS.hlsl for the proposed solution.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@package/Shaders/VR/VRPostProcessCS.hlsl` around lines 29 - 33, The mode
constants (MODE_DISOCCLUDED, MODE_EDGE, MODE_MAIN, MODE_EDGE_NEIGHBOUR,
MODE_FULL_BLEND) are duplicated here (also in StereoBlendCS), so extract these
defines into a single shared header (e.g., a common Modes.hlsl) and include that
header from VRPostProcessCS.hlsl and StereoBlendCS.hlsl; replace the local
`#define` block in VRPostProcessCS.hlsl with an `#include` of the shared file to
remove duplication and keep symbols consistent across shaders.

---

79-110: Bilateral blend logic duplicated from StereoBlendCS.

The depth-weighted bilateral blend implementation (lines 80-110) is nearly identical to the MODE_FULL_BLEND path in StereoBlendCS.hlsl (lines 151-198). Consider extracting to a shared utility function:

♻️ Extract shared bilateral blend function

Create a helper in Common/VR.hlsli or a new shared header:

float4 BilateralBlendCrossEye(
    float4 centerColor,
    float centerDepth,
    float4 otherColor,
    float otherDepth,
    float debugEdgeTint)
{
    float maxDepth = max(max(centerDepth, otherDepth), 1e-5);
    float depthAgreement = 1.0 - saturate(abs(centerDepth - otherDepth) / maxDepth / 0.02);
    float blendWeight = 0.5 * depthAgreement;
    
    float4 result = lerp(centerColor, otherColor, blendWeight);
    if (debugEdgeTint > 0)
        result.rgb = lerp(result.rgb, float3(0, 1, 1), debugEdgeTint);
    return result;
}

This reduces code duplication and ensures both shaders use identical blending behavior.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@package/Shaders/VR/VRPostProcessCS.hlsl` around lines 79 - 110, Duplicate
depth-weighted bilateral blend logic in VRPostProcessCS.hlsl (inside the
MODE_FULL_BLEND block using variables center/result, centerDepth, otherColor,
otherDepth, DebugEdgeTint) should be extracted into a shared helper (e.g.,
BilateralBlendCrossEye) in a common header (Common/VR.hlsli) and both shaders
should call that helper instead of duplicating the math; create a function that
accepts centerColor (float4), centerDepth (float), otherColor (float4),
otherDepth (float), debugEdgeTint (float) and returns the blended float4, then
replace the blending code in VRPostProcessCS.hlsl and the MODE_FULL_BLEND path
in StereoBlendCS.hlsl with a call to BilateralBlendCrossEye and preserve the
existing DebugEdgeTint-based tinting behavior and result assignment.

package/Shaders/VR/StereoBlendCS.hlsl (1)

28-34: Mode constants duplicated - risk of desync.

Mode constants are duplicated here because the cbuffers conflict. Consider extracting just the mode constants to a separate header that both shaders can include:

♻️ Extract mode constants to shared header

Create VRStereoOptimizations/modes.hlsli:

`#ifndef` VR_STEREO_OPT_MODES_HLSLI
`#define` VR_STEREO_OPT_MODES_HLSLI

`#define` MODE_DISOCCLUDED 0
`#define` MODE_EDGE 1
`#define` MODE_MAIN 2
`#define` MODE_EDGE_NEIGHBOUR 3
`#define` MODE_FULL_BLEND 4

`#endif`

Then include it in both files instead of duplicating the defines.

This reduces the risk of the constants diverging between files.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@package/Shaders/VR/StereoBlendCS.hlsl` around lines 28 - 34, The mode defines
(MODE_DISOCCLUDED, MODE_EDGE, MODE_MAIN, MODE_EDGE_NEIGHBOUR, MODE_FULL_BLEND)
are duplicated and risk diverging; extract these constants into a shared header
(e.g., VRStereoOptimizations/modes.hlsli) and replace the local `#define` block in
StereoBlendCS.hlsl (and the other shader that currently defines them) with an
`#include` of that shared header so both shaders reference the same canonical
constants.

src/Features/VR/StereoBlend.cpp (1)

110-120: RTV references released prematurely before restore.

The RTVs retrieved at line 114 are immediately released in lines 116-119, but they're only used to keep the same RTVs bound (with nullptr DSV). The issue is that after dispatch, the restore logic at lines 174-180 fetches new RTVs rather than restoring the originally saved ones. This works because the RTVs don't actually change during the CS dispatch, but the pattern is fragile and unnecessarily releases COM references.

Consider simplifying by only saving/restoring the DSV since the RTVs aren't being modified:

♻️ Simplified DSV-only save/restore

 	// Save and unbind DSV to avoid SRV/DSV conflict on depth buffer in overwrite mode
-	ID3D11RenderTargetView* savedRTVs[D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT] = {};
 	ID3D11DepthStencilView* savedDSV = nullptr;
 	if (isOverwriteMode) {
-		context->OMGetRenderTargets(D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, savedRTVs, &savedDSV);
-		context->OMSetRenderTargets(D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, savedRTVs, nullptr);
-		for (auto& rtv : savedRTVs) {
-			if (rtv)
-				rtv->Release();
-		}
+		context->OMGetRenderTargets(0, nullptr, &savedDSV);
+		if (savedDSV)
+			context->OMSetDepthStencilView(nullptr, savedDSV);  // Unbind DSV only
 	}

Note: The current approach does work correctly at runtime since RTVs remain unchanged, but the code could be clearer about its intent.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Features/VR/StereoBlend.cpp` around lines 110 - 120, The RTV array is
unnecessary and the code prematurely Releases RTV references; instead only
save/restore the DSV. Replace the savedRTVs logic (savedRTVs, OMGetRenderTargets
with D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, the OMSetRenderTargets call that
passes savedRTVs, and the loop that Releases RTVs) with a DSV-only sequence:
call context->OMGetRenderTargets(0, nullptr, &savedDSV) when isOverwriteMode is
true, call context->OMSetRenderTargets(0, nullptr, nullptr) before the compute
dispatch, and on restore call context->OMSetRenderTargets(0, nullptr, savedDSV)
and Release savedDSV; remove any code that Releases or manages savedRTVs and
adjust the restore logic to expect only savedDSV.

package/Shaders/VRStereoOptimizations/StencilCS.hlsl (1)

96-124: Edge detection performance note.

The nested loop at lines 106-124 runs for each of the 4 directions up to maxWidth (2) distance. The [loop] attribute on the outer loop prevents unrolling, which is appropriate for the variable iteration count. The inner [unroll] on the 4-direction loop is correct.

However, consider that nearestEdgeDist is checked inside the inner loop but the outer loop continues even after finding an edge at distance 1. Since distance 1 edges immediately classify as MODE_EDGE, you could add an early break:

♻️ Optional: Early break when immediate edge found

 	[loop] for (uint d = 1; d <= maxWidth; d++)
 	{
 		[unroll] for (int i = 0; i < 4; i++)
 		{
 			// ... existing code ...
 			if (relDepthDiff > EdgeDepthThreshold && d < nearestEdgeDist) {
 				nearestEdgeDist = d;
 				nearestWeAreOuter = (linNeighbor < linCenter);
 			}
 		}
+		// Early exit if we found an immediate neighbor discontinuity
+		if (nearestEdgeDist == 1)
+			break;
 	}

This is a minor optimization since the loop only runs 2 iterations max, but it could save a few texture fetches per edge pixel.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@package/Shaders/VRStereoOptimizations/StencilCS.hlsl` around lines 96 - 124,
The edge-detection loops should exit early once an immediate neighbor edge is
found: inside the outer loop that iterates d from 1..maxWidth (when
skipEdgeDetection is false), after the inner unrolled loop that checks all
offsets[], check if nearestEdgeDist == d (or specifically == 1) and break the
outer loop to avoid extra texture fetches; update the loop surrounding logic
that uses nearestEdgeDist/nearestWeAreOuter (and references DepthTexture,
linCenter, EdgeDepthThreshold) so behavior is unchanged except for the early
exit.

package/Shaders/Lighting.hlsl (1)

3180-3185: ⚠️ Potential issue | 🟠 Major

EMAT_ENVMAP still drops pixelOffset in Reflectance.w.

The guard on Line 3180 still excludes ENVMAP-only EMAT permutations, even though complexMaterialParallax writes pixelOffset in that path. In VR overwrite mode those materials will still reproject without the parallax depth correction.

🛠️ Suggested fix

-#		if (defined(EMAT) || defined(TRUE_PBR)) && (defined(PARALLAX) || defined(LANDSCAPE) || defined(TRUE_PBR))
-	psout.Reflectance = float4(indirectLobeWeights.specular,
-		(pixelOffset > 0.0) ? saturate(pixelOffset) : 0.0);
-#		else
-	psout.Reflectance = float4(indirectLobeWeights.specular, 0.0);
-#		endif
+	psout.Reflectance = float4(
+		indirectLobeWeights.specular,
+		(pixelOffset > 0.0) ? saturate(pixelOffset) : 0.0);

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@package/Shaders/Lighting.hlsl` around lines 3180 - 3185, The Reflectance.w
assignment currently only includes pixelOffset for permutations matching (EMAT
|| TRUE_PBR) && (PARALLAX || LANDSCAPE || TRUE_PBR), which misses ENVMAP-only
EMAT permutations where complexMaterialParallax writes pixelOffset; update the
preprocessor condition around the psout.Reflectance assignment to also include
the EMAT_ENVMAP/ENVMAP-only EMAT permutation (e.g., change the guard to check
defined(EMAT) || defined(EMAT_ENVMAP) || defined(TRUE_PBR)) so that when
complexMaterialParallax produces pixelOffset you assign psout.Reflectance =
float4(indirectLobeWeights.specular, (pixelOffset > 0.0) ? saturate(pixelOffset)
: 0.0); otherwise keep the existing zero fallback.

package/Shaders/DeferredCompositeCS.hlsl (1)

100-103: Use the shared stereo-opt mode constants here too.

package/Shaders/VRStereoOptimizations/cbuffers.hlsli is already the single source of truth for MODE_EDGE / MODE_MAIN. Duplicating 1 and 2 here makes this skip path easy to drift from the classification shaders if those values ever move.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@package/Shaders/DeferredCompositeCS.hlsl` around lines 100 - 103, The
if-block in DeferredCompositeCS.hlsl uses magic numbers (1 and 2) to check
StereoOptModeTexture for stereo-opt modes; replace those literals with the
shared constants MODE_MAIN and MODE_EDGE from
package/Shaders/VRStereoOptimizations/cbuffers.hlsli so the check uses the
canonical enums; ensure you `#include` or import that hlsli at the top of
DeferredCompositeCS.hlsl and change the condition "if (mode == 2 || mode == 1)"
to "if (mode == MODE_MAIN || mode == MODE_EDGE)" (using the existing variables
eyeIndex, StereoOptModeTexture, dispatchID.xy) so the logic stays in sync with
the classification shaders.

src/Deferred.cpp (1)

373-393: ⚠️ Potential issue | 🟠 Major

Always initialize t16 for the VR_STEREO_OPT composite variants.

GetComputeMainComposite*() compiles the shader with VR_STEREO_OPT whenever vrStereoOptimizations.loaded is true, but slot t16 is only bound and cleared when stereoMode != Off. If the feature is loaded but disabled, the shader can still see whatever SRV was left in slot 16 from an earlier dispatch.

Suggested fix

-		if (REL::Module::IsVR() && vrStereoOpt.loaded && vrStereoOpt.settings.stereoMode != VRStereoOptimizations::StereoMode::Off) {
-			ID3D11ShaderResourceView* modeSRV = vrStereoOpt.GetModeTextureSRV();
-			if (modeSRV)
-				context->CSSetShaderResources(16, 1, &modeSRV);
-		}
+		if (REL::Module::IsVR() && vrStereoOpt.loaded) {
+			ID3D11ShaderResourceView* modeSRV =
+				vrStereoOpt.settings.stereoMode != VRStereoOptimizations::StereoMode::Off ?
+					vrStereoOpt.GetModeTextureSRV() :
+					nullptr;
+			context->CSSetShaderResources(16, 1, &modeSRV);
+		}
@@
-		if (REL::Module::IsVR() && vrStereoOpt.loaded && vrStereoOpt.settings.stereoMode != VRStereoOptimizations::StereoMode::Off) {
+		if (REL::Module::IsVR() && vrStereoOpt.loaded) {
 			ID3D11ShaderResourceView* nullSRV = nullptr;
 			context->CSSetShaderResources(16, 1, &nullSRV);
 		}
@@
-		ID3D11ShaderResourceView* views[16]{ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr };
+		ID3D11ShaderResourceView* views[17]{};
 		context->CSSetShaderResources(0, ARRAYSIZE(views), views);

Also applies to: 421-422, 596-625

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Deferred.cpp` around lines 373 - 393, The VR stereo-mode SRV slot (t16)
can remain stale because
GetComputeMainComposite()/GetComputeMainCompositeInterior() compiles with
VR_STEREO_OPT whenever globals::features::vrStereoOptimizations.loaded is true,
but the code only binds/clears slot 16 when
vrStereoOptimizations.settings.stereoMode != Off; ensure t16 is always
initialized when vrStereoOptimizations.loaded is true by binding a null SRV to
slot 16 before Dispatch if stereoMode == Off (and still bind the real modeSRV
when stereoMode != Off), and always clear slot 16 after Dispatch; update the
same logic around both GetComputeMainComposite and
GetComputeMainCompositeInterior call sites (references: vrStereoOptimizations,
GetModeTextureSRV(), GetComputeMainComposite(),
GetComputeMainCompositeInterior(), context->CSSetShaderResources(16,...)).

package/Shaders/VRStereoOptimizations/StencilCS.hlsl (1)

106-143: ⚠️ Potential issue | 🟠 Major

EdgeWidth still has no effect on the outer/background band.

maxWidth is hardcoded to kInnerWidth, and the post-search classification never emits MODE_EDGE_NEIGHBOUR. That makes the configurable outer band dead code and drops background-side hits back to MODE_MAIN.

Suggested fix

-	// Use the larger of inner/outer widths for the search
-	uint maxWidth = kInnerWidth;
+	// Search far enough to classify both the fixed inner band and the configurable outer band.
+	uint maxWidth = max(kInnerWidth, EdgeWidth);
@@
 	if (nearestEdgeDist != 0xFFFFFFFF) {
 		// Classify based on distance and side
 		if (nearestEdgeDist == 1) {
 			// Immediate neighbor discontinuity: always MODE_EDGE regardless of side
 			ModeTextureRW[dtid] = MODE_EDGE;
 			return;
 		} else if (!nearestWeAreOuter && nearestEdgeDist <= kInnerWidth) {
 			// Inner/foreground band beyond distance 1
 			ModeTextureRW[dtid] = MODE_EDGE;
 			return;
+		} else if (nearestWeAreOuter && nearestEdgeDist <= EdgeWidth) {
+			// Outer/background band
+			ModeTextureRW[dtid] = MODE_EDGE_NEIGHBOUR;
+			return;
 		}
 	}

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@package/Shaders/VRStereoOptimizations/StencilCS.hlsl` around lines 106 - 143,
The search loop currently uses maxWidth = kInnerWidth so outer-band hits never
get detected; change maxWidth to include the outer band (e.g., maxWidth =
max(kInnerWidth, kOuterWidth) or use the configured EdgeWidth) and keep the same
neighbor detection logic (uses skipEdgeDetection, nearestEdgeDist,
nearestWeAreOuter). After the loop, update the classification: if
nearestEdgeDist == 1 set ModeTextureRW[dtid] = MODE_EDGE; else if
nearestWeAreOuter and nearestEdgeDist <= outerWidth then set ModeTextureRW[dtid]
= MODE_EDGE_NEIGHBOUR; else if !nearestWeAreOuter and nearestEdgeDist <=
kInnerWidth set MODE_EDGE; ensure you reference nearestEdgeDist,
nearestWeAreOuter, ModeTextureRW, MODE_EDGE_NEIGHBOUR and the chosen outer width
symbol so background-side hits are emitted correctly.

package/Shaders/VR/VRPostProcessCS.hlsl (1)

19-27: ⚠️ Potential issue | 🟠 Major

Mirror the full StereoBlendCB layout at b1.

StereoBlend.cpp uploads DepthSigma, MaxBlendFactor, ColorDiffThreshold, DebugEdgeTint, DebugMode, FullBlendDistance, and POMDepthScale, but this cbuffer only declares the tail fields. Every overwrite/debug parameter after RcpFrameDim is therefore read from the wrong bytes.

Suggested fix

 cbuffer VRPostProcessCB : register(b1)
 {
 	float2 FrameDim;
 	float2 RcpFrameDim;
+	float DepthSigma;
+	float MaxBlendFactor;
+	float ColorDiffThreshold;
 	float DebugEdgeTint;      // 0 = off, >0 = debug visualization strength
 	uint DebugMode;           // 0 = normal, 1 = depth map diagnostic, 2 = full blend depth visualizer
 	float FullBlendDistance;  // Linearized depth threshold for full blend zone visualization
+	float POMDepthScale;
 	float _pad;               // Pad to 16-byte alignment
 };

Expected result: the C++ StereoBlendCB definition and the HLSL VRPostProcessCB should have the same field order and compatible types.

#!/bin/bash
set -euo pipefail

echo "=== C++ StereoBlendCB ==="
rg -n -A20 -B3 'StereoBlendCB' src/Features/VR.h

echo
echo "=== Fields written before stereoBlendCB->Update ==="
nl -ba src/Features/VR/StereoBlend.cpp | sed -n '62,90p'

echo
echo "=== HLSL VRPostProcessCB ==="
nl -ba package/Shaders/VR/VRPostProcessCS.hlsl | sed -n '19,27p'

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@package/Shaders/VR/VRPostProcessCS.hlsl` around lines 19 - 27, The
VRPostProcessCB cbuffer in VRPostProcessCS.hlsl is missing the leading
StereoBlendCB fields written by StereoBlend.cpp (DepthSigma, MaxBlendFactor,
ColorDiffThreshold, etc.), causing subsequent fields to be misread; update
VRPostProcessCB to mirror the exact field order and types of the C++
StereoBlendCB (include DepthSigma, MaxBlendFactor, ColorDiffThreshold,
DebugEdgeTint, DebugMode, FullBlendDistance, POMDepthScale, and any padding) so
the HLSL layout matches StereoBlendCB used by StereoBlend.cpp and remains
16-byte aligned and bound to register(b1).

src/Deferred.cpp (1)

376-396: ⚠️ Potential issue | 🟠 Major

Always bind and clear t16 when VR_STEREO_OPT is compiled.

GetComputeMainComposite*() still enables VR_STEREO_OPT whenever the feature is loaded, but slot 16 is only set/cleared when stereoMode != Off. In the loaded-but-disabled case, Eye 1 can read an unbound or stale SRV, and the generic clear block still leaves slot 16 dirty.

Suggested fix

-		if (REL::Module::IsVR() && vrStereoOpt.loaded && vrStereoOpt.settings.stereoMode != VRStereoOptimizations::StereoMode::Off) {
-			ID3D11ShaderResourceView* modeSRV = vrStereoOpt.GetModeTextureSRV();
-			if (modeSRV)
-				context->CSSetShaderResources(16, 1, &modeSRV);
-		}
+		if (REL::Module::IsVR() && vrStereoOpt.loaded) {
+			ID3D11ShaderResourceView* modeSRV =
+				vrStereoOpt.settings.stereoMode != VRStereoOptimizations::StereoMode::Off ?
+					vrStereoOpt.GetModeTextureSRV() :
+					nullptr;
+			context->CSSetShaderResources(16, 1, &modeSRV);
+		}
@@
-		if (REL::Module::IsVR() && vrStereoOpt.loaded && vrStereoOpt.settings.stereoMode != VRStereoOptimizations::StereoMode::Off) {
+		if (REL::Module::IsVR() && vrStereoOpt.loaded) {
 			ID3D11ShaderResourceView* nullSRV = nullptr;
 			context->CSSetShaderResources(16, 1, &nullSRV);
 		}
@@
-		ID3D11ShaderResourceView* views[16]{ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr };
+		ID3D11ShaderResourceView* views[17]{};
 		context->CSSetShaderResources(0, ARRAYSIZE(views), views);

Also applies to: 414-417, 591-592, 619-620

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Deferred.cpp` around lines 376 - 396, The VR stereo mode SRV
binding/clearing is conditional on vrStereoOpt.settings.stereoMode, leaving slot
t16 dirty when the feature is loaded but disabled; update the code paths around
GetComputeMainComposite() / GetComputeMainCompositeInterior() to always bind a
valid SRV (either vrStereoOpt.GetModeTextureSRV() when stereoMode != Off or a
null SRV when stereoMode == Off) whenever vrStereoOpt.loaded is true, and always
clear slot 16 after Dispatch using context->CSSetShaderResources(16, 1,
&nullSRV); apply the same change to the other occurrences noted (around the
other Dispatch/unbind blocks) so t16 is never left uninitialized or stale.

src/Features/VRStereoOptimizations.cpp (1)

21-37: ⚠️ Potential issue | 🟡 Minor

Persist the new debug toggles.

DrawSettings() edits debugFullBlendDepth and debugPOMDepth, but SaveSettings() / LoadSettings() still ignore both fields. Those checkboxes reset every restart.

Suggested fix

 void VRStereoOptimizations::SaveSettings(json& o_json)
 {
 	o_json["StereoMode"] = settings.stereoMode;
 	o_json["DisocclusionDepthThreshold"] = settings.disocclusionDepthThreshold;
 	o_json["FullBlendDistance"] = settings.fullBlendDistance;
 	o_json["QualityJitterOffset"] = settings.qualityJitterOffset;
 	o_json["FoveatedRegionRadius"] = settings.foveatedRegionRadius;
 	o_json["FoveatedRegionCenterX"] = settings.foveatedRegionCenterX;
 	o_json["FoveatedRegionCenterY"] = settings.foveatedRegionCenterY;
 	o_json["UseEyeTracking"] = settings.useEyeTracking;
 	o_json["DebugVisualization"] = settings.debugVisualization;
 	o_json["DebugSkipMerge"] = settings.debugSkipMerge;
 	o_json["DebugForceAllStencil"] = settings.debugForceAllStencil;
 	o_json["DebugForceAllReprojectCS"] = settings.debugForceAllReprojectCS;
 	o_json["DebugDepthMap"] = settings.debugDepthMap;
+	o_json["DebugFullBlendDepth"] = settings.debugFullBlendDepth;
+	o_json["DebugPOMDepth"] = settings.debugPOMDepth;
 	o_json["POMDepthScale"] = settings.pomDepthScale;
 }
@@
 	if (auto it = o_json.find("DebugDepthMap"); it != o_json.end() && it->is_boolean())
 		settings.debugDepthMap = it->get<bool>();
+	if (auto it = o_json.find("DebugFullBlendDepth"); it != o_json.end() && it->is_boolean())
+		settings.debugFullBlendDepth = it->get<bool>();
+	if (auto it = o_json.find("DebugPOMDepth"); it != o_json.end() && it->is_boolean())
+		settings.debugPOMDepth = it->get<bool>();
 	if (auto it = o_json.find("FullBlendDistance"); it != o_json.end() && it->is_number())
 		settings.fullBlendDistance = std::clamp(it->get<float>(), 0.0f, 50000.0f);
 	if (auto it = o_json.find("POMDepthScale"); it != o_json.end() && it->is_number())
 		settings.pomDepthScale = std::clamp(it->get<float>(), 0.0f, 500.0f);
 }

Also applies to: 39-69

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Features/VRStereoOptimizations.cpp` around lines 21 - 37,
SaveSettings/LoadSettings currently ignore the two new debug toggles edited by
DrawSettings: settings.debugFullBlendDepth and settings.debugPOMDepth; add
persistence for these fields by writing them into SaveSettings (e.g., add JSON
entries for DebugFullBlendDepth and DebugPOMDepth) and reading them back in
LoadSettings so the boolean values are restored on startup, making sure the JSON
keys match between save/load and the read uses the same types as other debug
flags (refer to functions VRStereoOptimizations::SaveSettings,
VRStereoOptimizations::LoadSettings and the fields
debugFullBlendDepth/debugPOMDepth).

src/Features/VRStereoOptimizations.cpp (1)

21-37: ⚠️ Potential issue | 🟡 Minor

Persist the debug toggles that DrawSettings() edits.

debugFullBlendDepth and debugPOMDepth are user-editable here, but SaveSettings() / LoadSettings() never round-trip them. Both flags reset on restart, and the matching VR::DrawStereoBlend() debug modes stop being reproducible from config.

🛠️ Proposed fix

 void VRStereoOptimizations::SaveSettings(json& o_json)
 {
 	o_json["StereoMode"] = settings.stereoMode;
 	o_json["DisocclusionDepthThreshold"] = settings.disocclusionDepthThreshold;
 	o_json["FullBlendDistance"] = settings.fullBlendDistance;
 	o_json["QualityJitterOffset"] = settings.qualityJitterOffset;
 	o_json["FoveatedRegionRadius"] = settings.foveatedRegionRadius;
 	o_json["FoveatedRegionCenterX"] = settings.foveatedRegionCenterX;
 	o_json["FoveatedRegionCenterY"] = settings.foveatedRegionCenterY;
 	o_json["UseEyeTracking"] = settings.useEyeTracking;
 	o_json["DebugVisualization"] = settings.debugVisualization;
 	o_json["DebugSkipMerge"] = settings.debugSkipMerge;
 	o_json["DebugForceAllStencil"] = settings.debugForceAllStencil;
 	o_json["DebugForceAllReprojectCS"] = settings.debugForceAllReprojectCS;
 	o_json["DebugDepthMap"] = settings.debugDepthMap;
+	o_json["DebugFullBlendDepth"] = settings.debugFullBlendDepth;
+	o_json["DebugPOMDepth"] = settings.debugPOMDepth;
 	o_json["POMDepthScale"] = settings.pomDepthScale;
 }
…
 	if (auto it = o_json.find("DebugDepthMap"); it != o_json.end() && it->is_boolean())
 		settings.debugDepthMap = it->get<bool>();
+	if (auto it = o_json.find("DebugFullBlendDepth"); it != o_json.end() && it->is_boolean())
+		settings.debugFullBlendDepth = it->get<bool>();
+	if (auto it = o_json.find("DebugPOMDepth"); it != o_json.end() && it->is_boolean())
+		settings.debugPOMDepth = it->get<bool>();
 	if (auto it = o_json.find("FullBlendDistance"); it != o_json.end() && it->is_number())
 		settings.fullBlendDistance = std::clamp(it->get<float>(), 0.0f, 50000.0f);

Also applies to: 39-69, 252-254

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Features/VRStereoOptimizations.cpp` around lines 21 - 37,
SaveSettings/LoadSettings currently do not persist the user-editable debug
toggles debugFullBlendDepth and debugPOMDepth edited by
DrawSettings/VR::DrawStereoBlend, so they reset on restart; update SaveSettings
(function VRStereoOptimizations::SaveSettings) to write
settings.debugFullBlendDepth and settings.debugPOMDepth into the JSON (use keys
like "DebugFullBlendDepth" and "DebugPOMDepth") and update the corresponding
LoadSettings logic to read those keys back into settings.debugFullBlendDepth and
settings.debugPOMDepth so the flags round-trip with the rest of settings.

src/Deferred.cpp (1)

375-395: ⚠️ Potential issue | 🟠 Major

Bind and clear t16 on the same condition used to compile VR_STEREO_OPT.

Deferred::GetComputeMainComposite*() enables VR_STEREO_OPT whenever vrStereoOpt.loaded, but Deferred::DeferredPasses() only touches slot 16 when stereoMode != Off. In the loaded-but-disabled case the composite shader can still read stale or unbound data from t16, and the generic cleanup block never clears that slot.

🛠️ Proposed fix

-		if (REL::Module::IsVR() && vrStereoOpt.loaded && vrStereoOpt.settings.stereoMode != VRStereoOptimizations::StereoMode::Off) {
-			ID3D11ShaderResourceView* modeSRV = vrStereoOpt.GetModeTextureSRV();
-			if (modeSRV)
-				context->CSSetShaderResources(16, 1, &modeSRV);
-		}
+		if (REL::Module::IsVR() && vrStereoOpt.loaded) {
+			ID3D11ShaderResourceView* modeSRV =
+				vrStereoOpt.settings.stereoMode != VRStereoOptimizations::StereoMode::Off ?
+					vrStereoOpt.GetModeTextureSRV() :
+					nullptr;
+			context->CSSetShaderResources(16, 1, &modeSRV);
+		}
…
-		if (REL::Module::IsVR() && vrStereoOpt.loaded && vrStereoOpt.settings.stereoMode != VRStereoOptimizations::StereoMode::Off) {
+		if (REL::Module::IsVR() && vrStereoOpt.loaded) {
 			ID3D11ShaderResourceView* nullSRV = nullptr;
 			context->CSSetShaderResources(16, 1, &nullSRV);
 		}
…
-		ID3D11ShaderResourceView* views[16]{ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr };
+		ID3D11ShaderResourceView* views[17]{};
 		context->CSSetShaderResources(0, ARRAYSIZE(views), views);

Also applies to: 415-416, 590-591, 618-619

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Deferred.cpp` around lines 375 - 395, DeferredPasses binds t16 only when
vrStereoOpt.settings.stereoMode != Off but the composite shaders
(Deferred::GetComputeMainComposite*()) enable VR_STEREO_OPT whenever
vrStereoOpt.loaded, which can leave t16 stale; change the SRV bind and unbind
checks to the same condition used at compile time (i.e., REL::Module::IsVR() &&
vrStereoOpt.loaded) so slot 16 is always set to a valid SRV or explicitly
cleared when vrStereoOpt.loaded is true, using vrStereoOpt.GetModeTextureSRV()
for bind and a null SRV for unbind (affects the CSSetShaderResources calls that
touch slot 16 and the cleanup paths at the other occurrences you noted).

features/Extended Materials/Shaders/ExtendedMaterials/ExtendedMaterials.hlsli (1)

1-1: Optional PR polish: commit title casing + issue keyword.

Consider: feat(vr): optimize screen-space shadows for vr (lowercase description), and if tracked, add an issue keyword like Implements #<id> in the PR body.

As per coding guidelines, PRs should include Conventional Commit formatting suggestions and Issue References where applicable.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@features/Extended`
Materials/Shaders/ExtendedMaterials/ExtendedMaterials.hlsli at line 1, Update
the PR title to follow Conventional Commits (e.g., "feat(vr): optimize
screen-space shadows for vr" with a lowercase description) and add an issue
reference line in the PR body like "Implements #<id>" so the change in
ExtendedMaterials.hlsli (the Extended Materials shader file) is tracked; ensure
the commit message and PR body are updated accordingly before merging.

src/Features/ScreenSpaceShadows.h (1)

65-65: Default enableStereoSync = false is a behavior change for existing users.

Existing VR users with saved enableStereoSync=true will retain that setting (per LoadSettings behavior in the context snippet), but new installations will default to disabled. Consider whether this warrants a note in release documentation.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Features/ScreenSpaceShadows.h` at line 65, The field enableStereoSync in
class/struct ScreenSpaceShadows currently defaults to false which changes
behavior for new installs; to preserve prior VR behavior, change the default
initializer of enableStereoSync to true in ScreenSpaceShadows.h (symbol:
enableStereoSync) and also add a short note to the release/upgrade documentation
indicating the default for enableStereoSync for clarity; update any related
LoadSettings/SaveSettings handling if it assumes the old default.

package/Shaders/DeferredCompositeCS.hlsl (1)

100-107: Consider using named constants instead of magic numbers.

The mode values 1 and 2 correspond to MODE_EDGE and MODE_MAIN from modes.hlsli. Using the named constants would improve readability and prevent errors if mode values change.

💡 Suggested improvement

+#include "VRStereoOptimizations/modes.hlsli"
...
-		if (mode == 2 || mode == 1) {  // MODE_MAIN or MODE_EDGE — stencil-culled, reprojected by StereoBlend
+		if (mode == MODE_MAIN || mode == MODE_EDGE) {  // stencil-culled, reprojected by StereoBlend

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@package/Shaders/DeferredCompositeCS.hlsl` around lines 100 - 107, Replace the
magic numeric literals 1 and 2 in the VR_STEREO_OPT block with the corresponding
named constants from modes.hlsli (MODE_EDGE and MODE_MAIN) to improve
readability and maintainability; update the condition in the
DeferredCompositeCS.hlsl code that checks
StereoOptModeTexture[uint2(dispatchID.xy)] to use MODE_MAIN and MODE_EDGE (and
include or reference modes.hlsli if necessary) so the comparison becomes
explicit and robust if values change.

src/Features/VRStereoOptimizations.h (1)

194-195: Consider documenting cache invalidation strategy.

The dssCache maps original DSS pointers to modified versions. If the game recreates DSS objects with the same parameters but different addresses, stale entries will accumulate. This is likely fine for typical usage patterns, but a brief comment about expected lifecycle would help maintainers.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Features/VRStereoOptimizations.h` around lines 194 - 195, dssCache
currently maps ID3D11DepthStencilState* to modified com_ptrs but has no comment
about when entries are invalidated; add a short comment next to dssCache
explaining the expected lifecycle and chosen invalidation strategy (e.g.,
"entries are valid while the original ID3D11DepthStencilState* lives; caller
must clear or rebuild this cache on device reset or when the game recreates DSS
objects", or document that alternative strategies like keying by state
descriptor or pruning on Release/creation hooks should be used if
reuse-by-address is not guaranteed). Mention the symbol dssCache and the
involved type ID3D11DepthStencilState* and, if applicable, reference the code
paths that should trigger cache clearing (device reset, depth-stencil creation
hook, or explicit ClearDssCache/OnDssDestroyed helper).